Data source adapter, virtual data loader, TreeList data controller and data source adapter - type grid_core data source adapter and utils by bit-byte0 · Pull Request #35490 · DevExpress/DevExtreme

bit-byte0 · 2026-10-05T23:43:57Z

What

Added strict types to the grid_core data source adapter and its helper utilities, so m_data_source_adapter.ts and m_data_source_adapter_utils.ts pass the strict lint rules while keeping the m_ prefix

How

Annotated fields, parameters and return types and replaced loose any with real types, keeping the widely used public getters unchanged

Copilot

Copilot review overview

🟢 Approval recommended

The type-focused changes preserve existing control flow and remain consistent with related adapters and callers.

Review effort: Balanced
Findings: None

What changed in this PR

Adds strict typing to the grid-core data source adapter and cache utilities without changing public behavior.

Changes:

Typed adapter state, handlers, and load operations.
Typed cache, paging, and grouping helpers.
Added grouped paging metadata to LoadOperation.

File	Description
`types.ts`	Adds grouped paging fields.
`m_data_source_adapter.ts`	Types adapter fields and methods.
`m_data_source_adapter_utils.ts`	Types cache and operation utilities.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Copilot

Copilot review overview

🔵 Needs a closer look

The lastLoadOptions() return type incorrectly asserts required fields when returning an empty object.

Review effort: Balanced
Findings: None

Previously missed (1)

In code that hasn't changed since last review

Avoid asserting required pagination fields before initial load

packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/m_data_source_adapter.ts:823

This cast makes the getter claim that pageIndex and pageSize always exist, but before the first load _lastLoadOptions is undefined and this branch returns {}. That leaves callers with an unsound numeric contract. Return a partial shape here, matching data_source_controller.ts:182, instead of asserting required fields.

anna-shakhova · 2026-10-07T08:16:41Z

+  private _currentTotalCount!: number;

+  // eslint-disable-next-line @typescript-eslint/no-explicit-any -- virtual_scrolling override
  protected _items: any;


replace to unknown[] if we cannot properly type items right now

anna-shakhova · 2026-10-07T08:27:21Z

   */
  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  protected _changeRowExpandCore(path?: any) {}
+  protected _changeRowExpandCore(path?: unknown): void {}


lets try get better type from usage

anna-shakhova · 2026-10-07T08:27:51Z

  public totalCount(): number {
-    // eslint-disable-next-line radix
-    return parseInt((this._currentTotalCount || this._dataSourceTotalCount()) + this._totalCountCorrection);
+    const count = (this._currentTotalCount || this._dataSourceTotalCount())


lets introduce variable for 1st part, it is difficult to read now

Copilot

Copilot review overview

🔵 Needs a closer look

The data-index getter incorrectly promises a number although uncached keys return undefined.

Review effort: Balanced
Findings: None

Previously missed (1)

In code that hasn't changed since last review

Allow data index getter to return undefined

packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/m_data_source_adapter.ts:330

The callback can return undefined when store.keyOf(data) is absent from _dataIndexByKey, but the new annotation promises a number. This hides a real result that sort consumers can receive. Please type _dataIndexGetter, this callback, and getDataIndexGetter() as returning number | undefined.

Copilot

Copilot review overview

🔵 Needs a closer look

Two new type contracts promise capabilities or defined results that their implementations do not guarantee.

Review effort: Balanced
Findings: None

Previously missed (2)

In code that hasn't changed since last review

Allow data index getter to return undefined

packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/m_data_source_adapter.ts:68

The getter can return undefined: when _cachedStoreData is unset or does not contain the requested key, the record lookup in getDataIndexGetter has no value. Declaring this callback as always returning number hides that valid outcome from callers. Please use number | undefined consistently in this field, getDataIndexGetter, and the delegating controller signature.

Narrow extension-point return type to key-info shape

packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/m_data_source_adapter.ts:351

This extension-point contract is broader than the object it actually guarantees. The TreeList override returns only key and keyOf (and currently has to cast that object to Store), while this method is consumed solely as applyBatch key information. Typing it as a full Store can let future callers invoke methods that are absent at runtime; narrow the return type to the key-info shape.

refactor(grid): type grid_core data source adapter and utils

96f6c6d

bit-byte0 requested a review from a team as a code owner October 5, 2026 23:43

Copilot AI balanced review requested due to automatic review settings October 5, 2026 23:43

bit-byte0 added the 26_2 label Oct 5, 2026

bit-byte0 self-assigned this Oct 5, 2026

Copilot started reviewing on behalf of bit-byte0 October 5, 2026 23:44 View session

Copilot AI reviewed Oct 5, 2026

View reviewed changes

refactor(grid): create Deferred without new in data source adapter

ffb274d

Copilot AI balanced review requested due to automatic review settings October 6, 2026 18:40

Copilot started reviewing on behalf of bit-byte0 October 6, 2026 18:40 View session

Copilot AI reviewed Oct 6, 2026

View reviewed changes

anna-shakhova reviewed Oct 7, 2026

View reviewed changes

refactor(grid): type data source adapter items and last load options

4333c09

Copilot AI balanced review requested due to automatic review settings October 7, 2026 09:52

Copilot started reviewing on behalf of bit-byte0 October 7, 2026 09:53 View session

refactor(grid): use LastLoadOptions in data source controller

09af90b

Copilot AI reviewed Oct 7, 2026

View reviewed changes

Copilot AI balanced review requested due to automatic review settings October 7, 2026 09:56

Copilot started reviewing on behalf of bit-byte0 October 7, 2026 09:57 View session

anna-shakhova approved these changes Oct 7, 2026

View reviewed changes

Copilot AI reviewed Oct 7, 2026

View reviewed changes

Navigation Menu

Repository navigation

Data source adapter, virtual data loader, TreeList data controller and data source adapter - type grid_core data source adapter and utils - #35490

Data source adapter, virtual data loader, TreeList data controller and data source adapter - type grid_core data source adapter and utils#35490
bit-byte0 wants to merge 4 commits into
DevExpress:mainfrom
bit-byte0:refactor/type-data-source-adapter-main

bit-byte0 commented Oct 5, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

anna-shakhova Oct 7, 2026

Uh oh!

anna-shakhova Oct 7, 2026

Uh oh!

anna-shakhova Oct 7, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

This branch has not been deployed

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

bit-byte0 commented Oct 5, 2026

What

How

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Copilot review overview

🟢 Approval recommended

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Copilot review overview

🔵 Needs a closer look

Uh oh!

anna-shakhova Oct 7, 2026

Choose a reason for hiding this comment

Uh oh!

anna-shakhova Oct 7, 2026

Choose a reason for hiding this comment

Uh oh!

anna-shakhova Oct 7, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Copilot review overview

🔵 Needs a closer look

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Copilot review overview

🔵 Needs a closer look

Uh oh!

This branch has not been deployed

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants